Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build-support/rust: Organize #144193

Merged
merged 1 commit into from
Nov 7, 2021
Merged

build-support/rust: Organize #144193

merged 1 commit into from
Nov 7, 2021

Conversation

Ericson2314
Copy link
Member

Motivation for this change

  • toRustTarget and friends pulled out from rust tools into rust
    library. Since they don't depend on any packages they can be more
    widely useable.

  • build-rust-package gets its own directory

  • fetch-cargo-tarball gets its own directory

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@Mic92
Copy link
Member

Mic92 commented Nov 3, 2021

Eval error looks legit.

@Ericson2314 Ericson2314 marked this pull request as draft November 4, 2021 05:50
@Ericson2314
build-support/rust: Organize
18ed048 
 - `toRustTarget` and friends pulled out from rust tools into rust
   library. Since they don't depend on any packages they can be more
   widely useable.

 - `build-rust-package` gets its own directory

 - `fetch-cargo-tarball` gets its own directory
@Ericson2314 Ericson2314 force-pushed the rust-build-support-org branch from c20d442 to 18ed048 Compare November 7, 2021 19:23
@Ericson2314 Ericson2314 marked this pull request as ready for review November 7, 2021 19:25
@Ericson2314 Ericson2314 merged commit ccd6afd into NixOS:master Nov 7, 2021
@Ericson2314 Ericson2314 deleted the rust-build-support-org branch November 7, 2021 19:49
@github-actions
Copy link
Contributor

github-actions bot commented Nov 7, 2021

Backport failed for release-21.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-21.05
git worktree add -d .worktree/backport-144193-to-release-21.05 origin/release-21.05
cd .worktree/backport-144193-to-release-21.05
git checkout -b backport-144193-to-release-21.05
ancref=$(git merge-base 3b0bff383f8e894b1ee7a30b62c8b727a68511df 18ed048c7b27e288a6c9ba894790a7e67ed5080d)
git cherry-pick -x $ancref..18ed048c7b27e288a6c9ba894790a7e67ed5080d

1 similar comment
@github-actions
Copy link
Contributor

github-actions bot commented Nov 7, 2021

Backport failed for release-21.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-21.05
git worktree add -d .worktree/backport-144193-to-release-21.05 origin/release-21.05
cd .worktree/backport-144193-to-release-21.05
git checkout -b backport-144193-to-release-21.05
ancref=$(git merge-base 3b0bff383f8e894b1ee7a30b62c8b727a68511df 18ed048c7b27e288a6c9ba894790a7e67ed5080d)
git cherry-pick -x $ancref..18ed048c7b27e288a6c9ba894790a7e67ed5080d

@Ericson2314 Ericson2314 mentioned this pull request Nov 7, 2021
Merged
12 tasks
@figsoda
Copy link
Member

figsoda commented Nov 7, 2021

this created a merge conflict in #144730

@Ericson2314
Copy link
Member Author

@figsoda OK I will fix

@Ericson2314
Copy link
Member Author

On the command line, it was conveniently not a conflict! Fixed.

@figsoda
Copy link
Member

figsoda commented Nov 7, 2021

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andir andir Awaiting requested review from andir

@LnL7 LnL7 Awaiting requested review from LnL7

@Mic92 Mic92 Awaiting requested review from Mic92

@zowoq zowoq Awaiting requested review from zowoq

Assignees
No one assigned
Labels
6.topic: rust 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Ericson2314 @Mic92 @figsoda